diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 4ae9e53..f10d1cf 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -11,4 +11,5 @@
 
 PRODUCT_MAKEFILES := \
 $(LOCAL_DIR)/hikey.mk \
+$(LOCAL_DIR)/hikey32.mk \
 $(LOCAL_DIR)/hikey960.mk
diff --git a/device-common.mk b/device-common.mk
index b5526ec..23863ad 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -65,6 +65,9 @@
     android.hardware.memtrack@1.0-service \
     android.hardware.memtrack@1.0-impl
 
+# Nanohub tools
+PRODUCT_PACKAGES += stm32_flash nanoapp_cmd
+
 PRODUCT_PACKAGES +=	TIInit_11.8.32.bts \
 			wl18xx-fw-4.bin \
 			wl18xx-conf.bin
diff --git a/factory-images/generate-factory-images-hikey960.sh b/factory-images/generate-factory-images-hikey960.sh
index 9d2b02b..ce27027 100755
--- a/factory-images/generate-factory-images-hikey960.sh
+++ b/factory-images/generate-factory-images-hikey960.sh
@@ -33,12 +33,12 @@
 
 # copy over bootloader binaries
 cp $ANDROID_BUILD_TOP/$DEVICE_DIR/installer/hikey960/bl31.bin tmp/$PRODUCT-$VERSION/
-cp $ANDROID_BUILD_TOP/$DEVICE_DIR/installer/hikey960/fastboot.img tmp/$PRODUCT-$VERSION/
+cp $ANDROID_BUILD_TOP/$DEVICE_DIR/installer/hikey960/hisi-fastboot.img tmp/$PRODUCT-$VERSION/
 cp $ANDROID_BUILD_TOP/$DEVICE_DIR/installer/hikey960/lpm3.img tmp/$PRODUCT-$VERSION/
 cp $ANDROID_BUILD_TOP/$DEVICE_DIR/installer/hikey960/nvme.img tmp/$PRODUCT-$VERSION/
-cp $ANDROID_BUILD_TOP/$DEVICE_DIR/installer/hikey960/ptable.img tmp/$PRODUCT-$VERSION/
+cp $ANDROID_BUILD_TOP/$DEVICE_DIR/installer/hikey960/hisi-ptable.img tmp/$PRODUCT-$VERSION/
 cp $ANDROID_BUILD_TOP/$DEVICE_DIR/installer/hikey960/README tmp/$PRODUCT-$VERSION/
-cp $ANDROID_BUILD_TOP/$DEVICE_DIR/installer/hikey960/sec_xloader.img tmp/$PRODUCT-$VERSION/
+cp $ANDROID_BUILD_TOP/$DEVICE_DIR/installer/hikey960/hisi-sec_xloader.img tmp/$PRODUCT-$VERSION/
 
 # copy over dts.img
 cp $ANDROID_BUILD_TOP/out/target/product/hikey960/dt.img tmp/$PRODUCT-$VERSION/
@@ -72,9 +72,10 @@
 
 
 
-fastboot flash ptable		ptable.img
 fastboot flash xloader		sec_xloader.img
+fastboot flash ptable		ptable.img
 fastboot flash fastboot		fastboot.img
+fastboot reboot-bootloader
 fastboot flash nvme		nvme.img
 fastboot flash fw_lpm3		lpm3.img
 fastboot flash trustfirmware	bl31.bin
diff --git a/gralloc/Android.mk b/gralloc/Android.mk
index 2191b7e..fc62685 100644
--- a/gralloc/Android.mk
+++ b/gralloc/Android.mk
@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ifeq ($(TARGET_PRODUCT),hikey)
 LOCAL_PATH := $(call my-dir)
 
 # HAL module implemenation, not prelinked and stored in
@@ -34,4 +33,3 @@
 LOCAL_MODULE_RELATIVE_PATH := hw
 
 include $(BUILD_SHARED_LIBRARY)
-endif
diff --git a/hikey32.mk b/hikey32.mk
new file mode 100644
index 0000000..a08ee8c
--- /dev/null
+++ b/hikey32.mk
@@ -0,0 +1,10 @@
+# Set zygote32 config before one in hikey.mk
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote32
+PRODUCT_COPY_FILES += system/core/rootdir/init.zygote32.rc:root/init.zygote32.rc
+
+$(call inherit-product, device/linaro/hikey/hikey.mk)
+
+#
+# Overrides
+PRODUCT_NAME := hikey32
+PRODUCT_DEVICE := hikey32
diff --git a/hikey32/BoardConfig.mk b/hikey32/BoardConfig.mk
new file mode 100644
index 0000000..9d1fd4f
--- /dev/null
+++ b/hikey32/BoardConfig.mk
@@ -0,0 +1,18 @@
+include device/linaro/hikey/hikey/BoardConfig.mk
+
+TARGET_ARCH := arm
+TARGET_ARCH_VARIANT := armv7-a-neon
+TARGET_CPU_ABI := armeabi-v7a
+TARGET_CPU_ABI2 := armeabi
+TARGET_CPU_VARIANT := generic
+
+TARGET_2ND_ARCH :=
+TARGET_2ND_ARCH_VARIANT :=
+TARGET_2ND_CPU_ABI :=
+TARGET_2ND_CPU_ABI2 :=
+TARGET_2ND_CPU_VARIANT :=
+
+TARGET_SUPPORTS_64_BIT_APPS := false
+
+
+
diff --git a/hikey32/board-info.txt b/hikey32/board-info.txt
new file mode 100644
index 0000000..f054721
--- /dev/null
+++ b/hikey32/board-info.txt
@@ -0,0 +1,2 @@
+require board=hikey
+require version-bootloader=0.4
diff --git a/installer/hikey/fip.bin b/installer/hikey/fip.bin
index 1dfc5fb..0164ad5 100644
--- a/installer/hikey/fip.bin
+++ b/installer/hikey/fip.bin
Binary files differ
diff --git a/installer/hikey/l-loader.bin b/installer/hikey/l-loader.bin
index 70e303e..7f4b1e6 100644
--- a/installer/hikey/l-loader.bin
+++ b/installer/hikey/l-loader.bin
Binary files differ
diff --git a/installer/hikey960/flash-all.sh b/installer/hikey960/flash-all.sh
index 7b7db51..f203c85 100755
--- a/installer/hikey960/flash-all.sh
+++ b/installer/hikey960/flash-all.sh
@@ -15,9 +15,10 @@
 
 echo "android out dir:${ANDROID_PRODUCT_OUT}"
 
-fastboot flash ptable "${INSTALLER_DIR}"/ptable.img
-fastboot flash xloader "${INSTALLER_DIR}"/sec_xloader.img
-fastboot flash fastboot "${INSTALLER_DIR}"/fastboot.img
+fastboot flash xloader "${INSTALLER_DIR}"/hisi-sec_xloader.img
+fastboot flash ptable "${INSTALLER_DIR}"/hisi-ptable.img
+fastboot flash fastboot "${INSTALLER_DIR}"/hisi-fastboot.img
+fastboot reboot-bootloader
 fastboot flash nvme "${INSTALLER_DIR}"/nvme.img
 fastboot flash fw_lpm3   "${INSTALLER_DIR}"/lpm3.img
 fastboot flash trustfirmware   "${INSTALLER_DIR}"/bl31.bin
diff --git a/installer/hikey960/fastboot.img b/installer/hikey960/hisi-fastboot.img
similarity index 100%
rename from installer/hikey960/fastboot.img
rename to installer/hikey960/hisi-fastboot.img
Binary files differ
diff --git a/installer/hikey960/ptable.img b/installer/hikey960/hisi-ptable.img
similarity index 98%
rename from installer/hikey960/ptable.img
rename to installer/hikey960/hisi-ptable.img
index 7c9e36e..3a4fe68 100644
--- a/installer/hikey960/ptable.img
+++ b/installer/hikey960/hisi-ptable.img
Binary files differ
diff --git a/installer/hikey960/sec_xloader.img b/installer/hikey960/hisi-sec_xloader.img
similarity index 100%
rename from installer/hikey960/sec_xloader.img
rename to installer/hikey960/hisi-sec_xloader.img
Binary files differ